Working
- Fix serialization not tested