Ready to roll out new architecture