Updating es and cd.
Migrating to es 2 and cd 2