Move match method onto option