better support for models