Added a map to replace yoda