Updated/New Composer support for System_Socket

See diff for full changes