Added more to the server parser