Added option to disable adding the ids to the headers