Added support for storing history locally
merge