Added cluster preparation as separate task