Added most fields to surface output.