Move wait for method into common