Move to abstract sync adapter format