Splitting Helper to smaller, more specialized classes. Part 2