minor design changes to propertyresolver