Handle different architectures in a better way.