Added more of the support for cubes.