Added 'self' to new classmethods