Add shortcut functions support