adding new classes to setup
adding wrapper around __aggregatedData to be used for memory optimization