Update to new architecture.