Added expiration date field and type field