Add AD and AP support