Moved Matrix management from Cube to Spatial