API improvement