added execute.wait_time, pass cluster everywhere for better log messages