CORS and Api Products related changes