Updates to CustomSocket
Merged CustomSockets