Move more APIs down the chimney