Adding remaining fields.