Adding the improved CI modules.