Add history support
Add history support