OC-10380: add polymorphism