add categories support