Revised mapping to ES
Fixed merge conflict