Added main object structures and fixed ResultsAggregator bug.