Enh: properly dispatch data and metadata