Improved the PropertyPathMappingFactory