Oomodel enhancements