Architecture improvement 2