Updated DML roles to better fit with the new generated API