Buckets now accessible via name
Minor design changes