Changed shortcuts and update doc accordingly