Since this differs between serializers too, move the class into each with changes as appropriate
Vastly improves code quality and reusability