Added enum and bitmask category