Pass Map to input to avoid redundant mapping

Optimization only.