Update serialization
Update identifiers