Adjusted to cdi-utils 2.0.1