Improve EclipseLink mappings

Related to #827