Added new models and relationships for the totalapp