Checkpoint before refactoring for List serialization