Added more server socket handlers