Re-Factoring of Data Controller.