Better arguments handler