Updated CDI handling to 1.1