21b7ad9 add support for serialization