Adding bucket generation