Better argument handling