CDI upgrade