Add timeout to specs
Move sending of response one level up when feasible