Added shortcut capability.