Updated to use expiration field