Improvements to gnmap parser.