Arguments handling improvement