Updated utility classes along with cuboid.