Architecture updates