Modified schema, simplifying queries