Added explitcit CORS handling