Get rid of enum in ControllerData to fix Jenkins errors