New files based on the new architecture