Moved keys from thread to server