Added enums instead of using text