TAP5-2260: Add support for CDI