Reduce code duplication via new support header