core: No need to map! here