ECMS-4340: Re-design for mange node types component