BUTO-43 First changes implemented to the aggregate script