Adding remaining models and controllers