Add history support