refactoring defaultPropertyInterceptor - part 1