Fixed correct usage of EvMapping class