[BUGFIX] Add missing PropertyMappingService