Added boolean to avoid automatic loading  if not enabled