I think it would be better without containers, they are intended for online identity but here they are being misused for grouping.