Add command line conditions for substitutions