Add more substitution rules