Adding fail_fast option