Added buckets support (1MB buckets)