add CDI support