Refactoring for usage with external TechDivision_Configuration library