Improve the shortcut example