Added OPTIONS handler selection