Added the ModelController and ModelControllerFactory