Updated for Grouping/Category riak json support