Result synch for offline mode & refactorings