Improved CDI server