Expiry times moved to metadata