(DI-1708) Basis add-on