More MapCube and CompositeMap changes