BLVIII-25 new classes for using Xmap within the AD framework