Added vash support