Slight API improvement