More changes for multibase