Don't reference non-included architectures (for now)

Don't reference non-included architectures (for now) #40