Add UC header fields, wip.