Added some natural keys for serialization