Web sync, refactoring is coming