Add categories support