more defaultPropertyInterceptor changes