Added @classmethod decorator and changed first parameter for all methods