Collection is now using changeSet