Eiliminated more of the serialVersionUID warnings