Minor architectural changes