Adding Expiration and Timestamp to MetadataBuilder