Overhauls category implementation