Improving Data Aggregation and Analysis to Address Challenges of an Evolving Energy Market