Add support for models in shells