Updated argument structure