Refactored further files to rely on automatic serialization creation.