Lombok fix
Сheckout minor changes