Transition to new base class (from Redmer)