added support for models to self