Improve mapping
Improve serialization and conversion