Add a few new cases