rework dataset metadata schema