Further improvement of Cubes v1.0 support