Re-factoring for CollectionAccessor