adding proper mapping to es