Added propertyparser