- Added @NotNull to method parameters and field where relevant.
- Also removed the annoying serialVersionUID.