Added case statements