More public API tweaking