Major changes include auto-including model