39 CDI support