Added manual es mappings