Added some of the missing fields. See HCBTMPLTE-48