added lombok(WIP)