Added simulation folder support