Feature analysis tweaks to Model