Stronger typed API