Moving to single api stub