Updated for yaidom 1.3.2