Fixed CDI integration.