Expiration paramater validation changes