Added support for Barrel and Large Vessel