Add new methods in data manager. remove unused contollers