refactor dataproc plugin