Added new models, updated view