added server and settings