Refactoring AD functionality