Feature/improve sync workflow