CommandExecutor added + HashMaps