[TASK] change implementation of category mapping