Feature/nova modeler improvements

Probably a bit long lines here and below.