[DF-4530] - Code Review, reimplemented using GlobalEnum class.