Added optimisation for collection of a single-bucket