Update Paths

Updated paths to include Environment variables.