Complete support of maps in syntax_tools

@psyeugenic