I think this class still fits the Factory pattern. It helps build a more complex object. I don't think we need to remove it.