Added some more server communication