Ease usage and update doc