Updated Data and ComponentLoader classes