Add remaining fields from client id.