Some more stuff, as well as COT compatibility.
CC: @thenameisnigel