Make bucketing optional