update AD related interface as suggested by Dmitry