Converted to class method instead of instance methods