Update for socket support