Improvements at AD enum