Added static methods to class macro