Updating base classes to support extension 0.6.0