Serializable classes updated to include serialVersionUID's