Accommodate new partial structure