Updated property names