Change cors support to be first