Getting ready for socket support