Yea for sure - these do get kind of complicated when you annotate a new module altogether. Hopefully less of an issue going forward especially with all of the work @simonjayhawkins has been putting in