Constants refactoring