Refactored the handling of multiple options on a single handler