Changes to allow async client x sync server