SI-6811 Reduce code duplication