Values refactoring