Changed schema. Added s-cubes