Changed for TF's server configuration