Updated option handler API