Changed sync handling and messaging