added server and db