Add halo and gpsoptimizer