Removed obsolete class
Extended CDI module
Extended CDI module