Added scenario and goals