Updated sync adapter and service