Improving Plan Execution Flexibility using Block-Substitution