Moved Socket Manager back to the framework