Added scope hints for categories