[*] Finish add/save servers