Cdi example improvements