Added harmonizer changes to new structure.