Minor changes in the new DSA wrappers (WIP)