Option model changes