- Better WOD compatibility