Add cuboid type support