reworking the structure to take advantage of the routing and filtering in collection