Marked a few classes and interfaces as Serializable