Fixing serialization; samples in data model