Added socket handlers