Move to the new architecture design