Implement architecture detection, initial idea thanks to @Ricky310711