Complete revamping of the Camel CDI section