Moving toward an inclusive architecture