Adapted the refactoring of constants