Convert static methods into objects