Updated to use assertCORS everywhere