Added socket support