Adding customer ID and fixing expiration date logic.