add stash support