Added option to specify variable case