Added not null contraint on agg_id.