Re write for categories parser