Improved Property code