Updated property names and proper attribute search