Added framework for using past entries and data storage