Model structure tweaks