Added controllers and models