Refactoring and fixing PTIcs HDC SLU when the CLDB was extended.