Make history inclusion optional