Changed to use enum class