Improved Sync
Fixed bugs in collection