Add school, additional changes for partial results.