Added path substitutions