Tweaks to include models