Fix category implementation duplicates