My suspicion is that moving them to the own object would indeed ease the burden here, and I'm not even convinced you necessarily need a factory to do it.