Model enhancements