Add handling for several APIs