Server now thread safe