Improve sync-table