imroved metadata behavior