added CDI support