restructure extradata a little