CDI support