- Doxygen comments
- Add serialization
