Lots of change
Add server list