continue serialize/deserialize refactorization