Add service-connection, improove server