CDI Inspector upgrade