Adding serialVersionUIDs
Refactoring Exceptions