Readding everything using lombok 0.11.7