Correct architecture