Updated option model