Improve argument handling