Replacing timeouts with waiting for schema changes\