Update to ES 1.0.0, add in interfaces from -orm-mod