Update for Buckets 0.0.7