Added data serialization classes