Adaptations for internal usage with AD