add categories support.