Further cleanup of the index implementations and initial methods for workspace split of the collections