Architecture features added