Added new models and controllers