Added unique endpoint machine names for metro