Deal with additional cases