Fixing adding back in the expiration and amount after API change.