Tweaked base class