Add Loading Helper in main solution