Improve sync adapter