Updating to use env variables