Add static structure and internalization