Added support for data serialization