Added support for expiration fields

Added expirationDate and voided fields