Added function to remove and add scenarios on the fly