Add data model. Remove extra controller.