Added Options and CORS support