Changed commandparser to return parsemap.