Add CMU and Adobe Research.
Update templates to support missing fields.