Added more server code