Adapt categories to the new asynchrnous methods