[MAGEMEP-114] Adding category support