Added more server functionality