Improved Architecture.CurrentSystem detection