map -> set, added const