[WIP] Fixing Serialization modules