Miscellaneous updates
Add Lombok support