removed enhancer and added lombok back