Added PropertyManager pt 2