Updated code with servers added