More changes for new architecture