Reworking on spec to match the new sockets