Implemented separated controllers