Added variables and case execution