Make CursorMutaion work even when collection name is not the class name
Merge conflicts