Site refactored; now need to do same for Collection (and update Site accordingly)