Property Handler implemented. UnitTests missing