Add some more subsitutions