fixed and model structure
added lombok