Adding more support for the models and users