Implemented expiration date field