add server and more