Separate internal API from shortcut_manager