FIx conflicts
FIx cmake files
Fix serialization