Add CategoryClient Support.