A little improvement to public API