Fixed #1 using raw data for expiration date if nothing set in the parsed data