Replaced assoc list by map datastructure.