Changes for new utilsnips