added support for history