Removed unused imports and set serialVersionUID when needed