2013-JAX: Added CDI stuff