Added class overrides