Added support for shortcuts.