Added new models to simplify the code