Adjust variables
Add DI code
Remove Lombok