minor perf. tuning
map data structure added (primitive JS objects)