Modified enum types for array support