more retries and force add of schemas