Move the file and filetype options into a base argument handler class, and allow adding hydrogens