Added initial multiple buckets support