Converted the legacy controller into a delegating handler