Adding basic server feature