add wait_for clauses to server creation