Replaced hard coded values with Enum