added updated models and controllers