Agreed, but the XML module should be handled in a separate PR in my opinion. Is it OK if I leave the compat module as it is now, or would you suggest to revert it?