Reworked the aggregateroot cell