Architecture improvement