Change expiration to timestamp