Added Server builder