Added back other architectures