Prepararion for cloud, removed provided, added lombok