Updated/New Composer support for System_Command

See diff for full changes