Updated build so it uses ESGF and ESMF together