Adds highlighting and selection to architecture