Added support for server wait-until mode