Implemented classes, these will eventually help replace the current aggregator structure