Option management improved.