LPS-35302
LPS-35302 Abstract things out even more