Refactor: Replace macros with enum class
Refactor: Replace macros with enum class