Property resolution refactoring