add repository field
reduce timeouts in few other places