Updated structure for simplified node hosting