* Refactor collection resources to use storage service * Add a feature flag * Update tests * Update stubs