Enhanced the syncing with the server