Updated option pattern