NS_ENUM modernization