Updated public API to be a little cleaner