added categories support