Now using ~Controller for all controller classes, for consistency and clarity