More consolidation.
Changed serialVersionUID
Minor change