Make cluster script use common functions