Upgrade to engine with base class extensions