Upgrading to work with lombok 0.11.7