Update metadata handling to be consistent with Compute