Better arguments parsing