Update stashes to use new API