Improve API so helper methods are on top level module as class methods