Migrate to ES v7

Changes: