Property view refactoring