Added API selection