Add language map, flesh out CommandDispatcher