Added some socket cases