Added expiration date fields, but they don't do anything yet