Feature/model field expansion

Required changes for new versions of ORM and ODM modules that are upcoming