Working on new parser.
Troubles with NameMap