Changed structure.
Updated static structure.