Updated to DAP 3.10