Updated the base ctor