[refac] map of definitions iso map of functions