Updating to use Enum