CORs functionality added