Adding support for CORS, and renamed few classes