Api additions

Closes #113