Enhancement: Added support for CORS