Allow for more architectures