Added architecture selection (x86/x64)