Handle properties correctly