Added Stash support