Enhaced architecture