#6748 Fixes ESMappingAPIImpl Class