Extend the replacement usage to include more cases