Implemented #2: Updated structs with new properties