Refactoring of serial/deserial entities