Added all classes as Serializable to support binary formatting