Added a few shortcut