Switched to environment variables