Updated to utilize environment variables