Added basic server logic