API improvements #22