Some modifications for synchronization to remote server.