Add OPTIONS support