Prepare to new architecture.