Fixes #243 Tuples should no longer be squashed in the event store

Add the Expiration and Timestamp to MetadataBuilder