make return values optional members of header