Added serializable attributes for public classes