Fixed serialization in Core