Add trackSubmits and trackChanges