Refactoring on ClientMap
Added serverMapVisitor & Updated ServerMap