Added minimal history support