Structure changed. Code path optimized for single/multi sample/