Added functionality for stashing/retrieving