Improving buckets' performance