added history aware support in dao