Updated/New Composer support for System_Shared

See diff for full changes