Make the architecture less dumb.