More changes to Base