Tested and modified Property class