Support new directory API