Adding AEDP Features