Fixing for the API changes in PropertyMap