Changes for the BigCube
More abstractions