Added per server controll feature