Added option to generate ID fields in output