Issue: #63

  * Added serialization code to all needed classes