Constants refactor