added maps to parser and scanner