Buckets are identified by a single 'tag' now