Tweak history support