Decouple the aggregated and operational values Rename statemanager to datasource_info_mapper Change-Id: Ied6220c08f10b6684e21dd22e011af246ec28d3