Thomas: update expireDate backend logic