Modified paths to match environment