Finished modularization of sockets