Updated property system