extract out shortcut_service and make it optional