Ensuring correct API selection