Removed @classmethod decorators