Updated based on Peach feedback

Tweaked API based on comments from James Peach.