Preliminary work on HistorySvc