Properties refactoring