Added PropertyManager