[CONTROLLER] Refatoring