Consolidate static methods into one API