Add withBucket method