Improved mappings in ES 1.x. Closes #400