Add full architecture