Added stricter type coupling in Dashboard_Controller