Added Path Substitutions