[TASK] Correct record data and Controller calling