Adding serialization capability