Added $PATH expansion