Merge new architecture into master