Improve argument reading