Speed optimizations (minor model adjustments)