Add bucket replacement feature