Buckets maintenance feature