Improved insertion and reconnection to server