Add CDI support for initialization