Updated property checking