Added McaCtrl and Criteria to solution.