Add basic categories support