Changes for intergration with DAP