Added bucket support, you may now track different buckets for each object