Improve CDI