Added Cuboid and Rectangle classes