Improved adding expiry dates