Enhanced cmd.eh