v0.5.7 Add Catch Target Logic