Prepare for the next release
A more intelligent public api