replaced commands by commandMap