Refactor for new split collection metadata structure