Updated to support new architectures