Updated The Facility to use set variable feature in AddOption