Buckets are a little more flexible + namespace fix