Added cdi and logging