Adding static methods support