Added propertymap and some tests