Add support for buckets retrieval.