Updated for new architectures.