added new models and associations