Added category list support