Integrated serialisation mechanism into generation and validation step factories.
Small refactor.