Started working on PropertyMap
merging