Updated to use Lombok