Major changes to API to upgrade to ES 1.3.2