Improve ASDG support