Add trait to simplify overriding