Added SerialVersionUID to all types