Refactor DataController to better control parameter evaluation.