Adding case statements