Add argument parsing to util modules