Changes to the controller factory adding comment blocks