Updated to the newer version of base classes