Improved sync support.