Implemented CDI