Extended the history support;