Upgraded strict_struct