Updated to match server config