A more intelligent public api