Added PropertyMap to centralize defintion of all property strings