Reduced code duplication through new common base class