added more checks for beaker machine architectures