Added SocketHandler with suport to arguments