Reworked PropertySet to stop raising on same val