more changes for metadata