Comply with VDBA 0.6.1 spec