API improvement.