added support for key-path to property mapping