Added additional files and ENV variables