Added bucketing method
Added more fields for keywords