Update how args are parsed to allow use from call_command