Added definitions for "cors" and "tea-merge"