Added ENUM for controls