Add categories support.