Introduce lombok
Update tests
Introduce optional
Cosme