CDI performance enhancements