Change enum to enum class