Updated/New Composer support for System_WinDrives

See diff for full changes