Added some server parsing