added choice of server type