Changed types to enums