Added support for OPTIONS