added server and handler