Refactoring to use AggregateRef as UUID pointer