Added remaining fields.